bitkeeper revision 1.1236.43.14 (424466ecgeg-norljKfMh0Tylfkxrg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 25 Mar 2005 19:30:52 +0000 (19:30 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 25 Mar 2005 19:30:52 +0000 (19:30 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-plax


Trivial merge